From: Jonas Ådahl Date: Thu, 4 Feb 2021 17:56:02 +0000 (+0100) Subject: Change all g_memdup() to g_memdup2() X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~616^2^2~476 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=463000d04d51ff7f29b039d5ea97a7b36fdd7b57;p=gnome-shell.git Change all g_memdup() to g_memdup2() Using g_memdup() is dangerous due to the type of the size argument. See https://gitlab.gnome.org/GNOME/glib/-/issues/2319 and https://gitlab.gnome.org/GNOME/glib/-/merge_requests/1926 for details. Part-of: --- diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 03455eea0..db621b073 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -29,7 +29,7 @@ variables: LINT_LOG: "eslint-report.xml" LINT_MR_LOG: "eslint-mr-report.xml" -image: registry.gitlab.gnome.org/gnome/mutter/fedora/33:x86_64-2021-01-14.0 +image: registry.gitlab.gnome.org/gnome/mutter/fedora/33:x86_64-2021-02-04.1 workflow: rules: diff --git a/src/st/st-private.c b/src/st/st-private.c index 2bdcf9b4b..5bbefa763 100644 --- a/src/st/st-private.c +++ b/src/st/st-private.c @@ -278,7 +278,7 @@ blur_pixels (guchar *pixels_in, gdouble blur, gint *width_out, gint *height_out, - gint *rowstride_out) + size_t *rowstride_out) { guchar *pixels_out; gdouble sigma; @@ -295,7 +295,7 @@ blur_pixels (guchar *pixels_in, *width_out = width_in; *height_out = height_in; *rowstride_out = rowstride_in; - pixels_out = g_memdup (pixels_in, *rowstride_out * *height_out); + pixels_out = g_memdup2 (pixels_in, *rowstride_out * *height_out); } else { @@ -593,7 +593,8 @@ _st_create_shadow_cairo_pattern (StShadow *shadow_spec_in, cairo_pattern_t *dst_pattern; guchar *pixels_in, *pixels_out; gint width_in, height_in, rowstride_in; - gint width_out, height_out, rowstride_out; + gint width_out, height_out; + size_t rowstride_out; cairo_matrix_t shadow_matrix; double xscale_in, yscale_in; int i, j;